From c58e9cd9eb3d4b49b97548cd9986743bcc9a9370 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 6 Apr 2011 21:44:42 -0500 Subject: [PATCH] Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure. The build should no longer fail when linking with --no-add-needed Previously, configure would clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS. This would break the build when compiling with a linker that defaults to --no-add-needed. For example: /usr/bin/ld: ftfont.o: undefined reference to symbol 'FcInit' configure should no longer clear these variables. Author: Reinhard Tartler Added-by: Rob Browning --- configure.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.in b/configure.in index baacfe4c9b1..063971598f0 100644 --- a/configure.in +++ b/configure.in @@ -2044,11 +2044,7 @@ if test "${HAVE_X11}" = "yes"; then ## We used to allow building with FreeType and without Xft. ## However, the ftx font backend driver is not in good shape. if test "${HAVE_XFT}" = "yes"; then - dnl As we use Xft, we anyway use freetype. - dnl There's no need for additional CFLAGS and LIBS. HAVE_FREETYPE=yes - FONTCONFIG_CFLAGS= - FONTCONFIG_LIBS= fi HAVE_LIBOTF=no -- 2.30.2